Autogenerated HTML docs for v2.47.0-72-gef8ce8
diff --git a/git-diff-tree.html b/git-diff-tree.html index 5b9aa18..44b5313 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -487,7 +487,7 @@ <dt class="hdlist1">--no-patch</dt> <dd> <p>Suppress all output from the diff machinery. Useful for -commands like <code>git show</code> that show the patch by default to +commands like <code>git</code> <code>show</code> that show the patch by default to squelch their output, or to cancel the effect of options like <code>--patch</code>, <code>--stat</code> earlier on the command line in an alias.</p> </dd> @@ -517,7 +517,7 @@ </dd> <dt class="hdlist1">--patch-with-raw</dt> <dd> -<p>Synonym for <code>-p --raw</code>.</p> +<p>Synonym for <code>-p</code> <code>--raw</code>.</p> </dd> <dt class="hdlist1">--indent-heuristic</dt> <dd> @@ -595,19 +595,19 @@ will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by -<code><width></code>. The width of the filename part can be limited by -giving another width <code><name-width></code> after a comma or by setting -<code>diff.statNameWidth=<width></code>. The width of the graph part can be -limited by using <code>--stat-graph-width=<width></code> or by setting -<code>diff.statGraphWidth=<width></code>. Using <code>--stat</code> or +<em><width></em>. The width of the filename part can be limited by +giving another width <em><name-width></em> after a comma or by setting +<code>diff.statNameWidth=</code><em><width></em>. The width of the graph part can be +limited by using <code>--stat-graph-width=</code><em><width></em> or by setting +<code>diff.statGraphWidth=</code><em><width></em>. Using <code>--stat</code> or <code>--stat-graph-width</code> affects all commands generating a stat graph, while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code> -does not affect <code>git format-patch</code>. -By giving a third parameter <code><count></code>, you can limit the output to -the first <code><count></code> lines, followed by <code>...</code> if there are more.</p> +does not affect <code>git</code> <code>format-patch</code>. +By giving a third parameter <em><count></em>, you can limit the output to +the first <em><count></em> lines, followed by ... if there are more.</p> <div class="paragraph"> -<p>These parameters can also be set individually with <code>--stat-width=<width></code>, -<code>--stat-name-width=<name-width></code> and <code>--stat-count=<count></code>.</p> +<p>These parameters can also be set individually with <code>--stat-width=</code><em><width></em>, +<code>--stat-name-width=</code><em><name-width></em> and <code>--stat-count=</code><em><count></em>.</p> </div> </dd> <dt class="hdlist1">--compact-summary</dt> @@ -625,7 +625,7 @@ deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two <code>-</code> instead of saying -<code>0 0</code>.</p> +<code>0</code> <code>0</code>.</p> </dd> <dt class="hdlist1">--shortstat</dt> <dd> @@ -662,7 +662,7 @@ natural concept of lines). This is a more expensive <code>--dirstat</code> behavior than the <code>changes</code> behavior, but it does count rearranged lines within a file as much as other changes. The resulting output -is consistent with what you get from the other <code>--*stat</code> options.</p> +is consistent with what you get from the other <code>--</code>*stat options.</p> </dd> <dt class="hdlist1"><code>files</code></dt> <dd> @@ -710,7 +710,7 @@ </dd> <dt class="hdlist1">--patch-with-stat</dt> <dd> -<p>Synonym for <code>-p --stat</code>.</p> +<p>Synonym for <code>-p</code> <code>--stat</code>.</p> </dd> <dt class="hdlist1">-z</dt> <dd> @@ -880,7 +880,7 @@ </dd> <dt class="hdlist1">plain</dt> <dd> -<p>Show words as <code>[-removed-]</code> and <code>{+added+}</code>. Makes no +<p>Show words as [<code>-removed-</code>] and {+added+}. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous.</p> </dd> @@ -915,7 +915,7 @@ <p>Every non-overlapping match of the <regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding -differences. You may want to append <code>|[^[:space:]]</code> to your regular +differences. You may want to append |[<code>^</code>[<code>:space:</code>]] to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline.</p> @@ -934,7 +934,7 @@ <dt class="hdlist1">--color-words[=<regex>]</dt> <dd> <p>Equivalent to <code>--word-diff=color</code> plus (if a regex was -specified) <code>--word-diff-regex=<regex></code>.</p> +specified) <code>--word-diff-regex=</code><em><regex></em>.</p> </dd> <dt class="hdlist1">--no-renames</dt> <dd> @@ -988,7 +988,7 @@ In diff-patch output format, <code>--full-index</code> takes higher precedence, i.e. if <code>--full-index</code> is specified, full blob names will be shown regardless of <code>--abbrev</code>. -Non default number of digits can be specified with <code>--abbrev=<n></code>.</p> +Non default number of digits can be specified with <code>--abbrev=</code><em><n></em>.</p> </dd> <dt class="hdlist1">-B[<n>][/<m>]</dt> <dt class="hdlist1">--break-rewrites[=[<n>][/<m>]]</dt> @@ -1001,7 +1001,7 @@ few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number <code>m</code> controls this aspect of the -B -option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the +option (defaults to 60%). <code>-B/70</code>% specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines).</p> @@ -1010,7 +1010,7 @@ <p>When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number <code>n</code> controls this aspect of -the -B option (defaults to 50%). <code>-B20%</code> specifies that a change with +the -B option (defaults to 50%). <code>-B20</code>% specifies that a change with addition and deletion compared to 20% or more of the file’s size are eligible for being picked up as a possible source of a rename to another file.</p> @@ -1022,19 +1022,19 @@ <p>Detect renames. If <code>n</code> is specified, it is a threshold on the similarity index (i.e. amount of addition/deletions compared to the -file’s size). For example, <code>-M90%</code> means Git should consider a +file’s size). For example, <code>-M90</code>% means Git should consider a delete/add pair to be a rename if more than 90% of the file -hasn’t changed. Without a <code>%</code> sign, the number is to be read as +hasn’t changed. Without a % sign, the number is to be read as a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes -0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is -the same as <code>-M5%</code>. To limit detection to exact renames, use -<code>-M100%</code>. The default similarity index is 50%.</p> +0.5, and is thus the same as <code>-M50</code>%. Similarly, <code>-M05</code> is +the same as <code>-M5</code>%. To limit detection to exact renames, use +<code>-M100</code>%. The default similarity index is 50%.</p> </dd> <dt class="hdlist1">-C[<n>]</dt> <dt class="hdlist1">--find-copies[=<n>]</dt> <dd> <p>Detect copies as well as renames. See also <code>--find-copies-harder</code>. -If <code>n</code> is specified, it has the same meaning as for <code>-M<n></code>.</p> +If <code>n</code> is specified, it has the same meaning as for <code>-M</code><em><n></em>.</p> </dd> <dt class="hdlist1">--find-copies-harder</dt> <dd> @@ -1051,7 +1051,7 @@ <dd> <p>Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and <code>/dev/null</code>. The resulting patch -is not meant to be applied with <code>patch</code> or <code>git apply</code>; this is +is not meant to be applied with <code>patch</code> or <code>git</code> <code>apply</code>; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, @@ -1083,7 +1083,7 @@ are Unmerged (<code>U</code>), are Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>). Any combination of the filter characters (including none) can be used. -When <code>*</code> (All-or-none) is added to the combination, all +When * (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected.</p> @@ -1117,8 +1117,8 @@ <p>Look for differences whose patch text contains added/removed lines that match <regex>.</p> <div class="paragraph"> -<p>To illustrate the difference between <code>-S<regex> --pickaxe-regex</code> and -<code>-G<regex></code>, consider a commit with the following diff in the same +<p>To illustrate the difference between <code>-S</code><em><regex></em> <code>--pickaxe-regex</code> and +<code>-G</code><em><regex></em>, consider a commit with the following diff in the same file:</p> </div> <div class="listingblock"> @@ -1129,8 +1129,8 @@ </div> </div> <div class="paragraph"> -<p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log --S"frotz\(nitfol" --pickaxe-regex</code> will not (because the number of +<p>While <code>git</code> <code>log</code> <code>-G</code>"frotz\(<code>nitfol</code>" will show this commit, <code>git</code> <code>log</code> +<code>-S</code>"frotz\(<code>nitfol</code>" <code>--pickaxe-regex</code> will not (because the number of occurrences of that string did not change).</p> </div> <div class="paragraph"> @@ -1195,8 +1195,8 @@ readability.</p> </li> <li> -<p>Lines starting with a hash ("<code>#</code>") are ignored, so they can be used -for comments. Add a backslash ("<code>\</code>") to the beginning of the +<p>Lines starting with a hash ("#") are ignored, so they can be used +for comments. Add a backslash ("\") to the beginning of the pattern if it starts with a hash.</p> </li> <li> @@ -1210,7 +1210,7 @@ <p>Patterns have the same syntax and semantics as patterns used for fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname -components matches the pattern. For example, the pattern "<code>foo*bar</code>" +components matches the pattern. For example, the pattern "<code>foo</code>*bar" matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p> </div> </dd> @@ -1220,7 +1220,7 @@ <p>Discard the files before the named <file> from the output (i.e. <em>skip to</em>), or move them to the end of the output (i.e. <em>rotate to</em>). These options were invented primarily for the use -of the <code>git difftool</code> command, and may not be very useful +of the <code>git</code> <code>difftool</code> command, and may not be very useful otherwise.</p> </dd> <dt class="hdlist1">-R</dt> @@ -1289,7 +1289,7 @@ <dd> <p>Show whole function as context lines for each change. The function names are determined in the same way as -<code>git diff</code> works out patch hunk headers (see <em>Defining a +<code>git</code> <code>diff</code> works out patch hunk headers (see <em>Defining a custom hunk-header</em> in <a href="gitattributes.html">gitattributes(5)</a>).</p> </dd> <dt class="hdlist1">--exit-code</dt> @@ -1303,7 +1303,7 @@ <p>Disable all output of the program. Implies <code>--exit-code</code>. Disables execution of external diff helpers whose exit code is not trusted, i.e. their respective configuration option -<code>diff.trustExitCode</code> or <code>diff.<driver>.trustExitCode</code> or +<code>diff.trustExitCode</code> or <code>diff.</code><em><driver></em><code>.trustExitCode</code> or environment variable <code>GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE</code> is false.</p> </dd> @@ -1527,7 +1527,7 @@ <dd> <p>Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the commit, when showing the commit log message. This is the default -for <code>git log</code>, <code>git show</code> and <code>git whatchanged</code> commands when +for <code>git</code> <code>log</code>, <code>git</code> <code>show</code> and <code>git</code> <code>whatchanged</code> commands when there is no <code>--pretty</code>, <code>--format</code>, or <code>--oneline</code> option given on the command line.</p> <div class="paragraph"> @@ -1570,7 +1570,7 @@ <dt class="hdlist1">--show-signature</dt> <dd> <p>Check the validity of a signed commit object by passing the signature -to <code>gpg --verify</code> and show the output.</p> +to <code>gpg</code> <code>--verify</code> and show the output.</p> </dd> <dt class="hdlist1">--no-commit-id</dt> <dd> @@ -1736,7 +1736,7 @@ </div> <div class="paragraph"> <p>This format is used to refer to another commit in a commit message and -is the same as <code>--pretty='format:%C(auto)%h (%s, %ad)'</code>. By default, +is the same as <code>--pretty=</code>'format:%C(<code>auto</code>)%h (%s, %ad)'. By default, the date is formatted with <code>--date=short</code> unless another <code>--date</code> option is explicitly specified. As with any <code>format:</code> with format placeholders, its output is not affected by other options like @@ -1777,7 +1777,7 @@ true parent commits, without taking grafts or history simplification into account. Note that this format affects the way commits are displayed, but not the way the diff is shown e.g. with -<code>git log --raw</code>. To get full object names in a raw diff format, +<code>git</code> <code>log</code> <code>--raw</code>. To get full object names in a raw diff format, use <code>--no-abbrev</code>.</p> </div> </li> @@ -1852,19 +1852,19 @@ default, colors are shown only when enabled for log output (by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and respecting the <code>auto</code> settings of the former if we are going to a -terminal). <code>%C(auto,...)</code> is accepted as a historical -synonym for the default (e.g., <code>%C(auto,red)</code>). Specifying -<code>%C(always,...)</code> will show the colors even when color is +terminal). %C(<code>auto,</code><code>...</code>) is accepted as a historical +synonym for the default (e.g., %C(<code>auto,red</code>)). Specifying +%C(<code>always,</code><code>...</code>) will show the colors even when color is not otherwise enabled (though consider just using <code>--color=always</code> to enable color for the whole output, including this format and anything else git might color). -<code>auto</code> alone (i.e. <code>%C(auto)</code>) will turn on auto coloring +<code>auto</code> alone (i.e. %C(<code>auto</code>)) will turn on auto coloring on the next placeholders until the color is switched again.</p> </dd> <dt class="hdlist1"><em>%m</em></dt> <dd> -<p>left (<code><</code>), right (<code>></code>) or boundary (<code>-</code>) mark</p> +<p>left (<), right (>) or boundary (<code>-</code>) mark</p> </dd> <dt class="hdlist1"><em>%w([<w>[,<i1>[,<i2>]]])</em></dt> <dd> @@ -1876,8 +1876,8 @@ <p>make the next placeholder take at least N column widths, padding spaces on the right if necessary. Optionally -truncate (with ellipsis <em>..</em>) at the left (ltrunc) <code>..ft</code>, -the middle (mtrunc) <code>mi..le</code>, or the end +truncate (with ellipsis <em>..</em>) at the left (ltrunc) <code>..</code><code>ft</code>, +the middle (mtrunc) <code>mi</code><code>..</code><code>le</code>, or the end (trunc) <code>rig..</code>, if the output is longer than N columns. Note 1: that truncating @@ -2079,22 +2079,22 @@ <dd> <p>ref names with custom decorations. The <code>decorate</code> string may be followed by a colon and zero or more comma-separated options. Option values may contain -literal formatting codes. These must be used for commas (<code>%x2C</code>) and closing -parentheses (<code>%x29</code>), due to their role in the option syntax.</p> +literal formatting codes. These must be used for commas (%x2C) and closing +parentheses (%x29), due to their role in the option syntax.</p> <div class="ulist"> <ul> <li> -<p><em>prefix=<value></em>: Shown before the list of ref names. Defaults to " <code>(</code>".</p> +<p><em>prefix=<value></em>: Shown before the list of ref names. Defaults to " (".</p> </li> <li> -<p><em>suffix=<value></em>: Shown after the list of ref names. Defaults to "<code>)</code>".</p> +<p><em>suffix=<value></em>: Shown after the list of ref names. Defaults to ")".</p> </li> <li> <p><em>separator=<value></em>: Shown between ref names. Defaults to "<code>,</code> ".</p> </li> <li> <p><em>pointer=<value></em>: Shown between HEAD and the branch it points to, if any. -Defaults to " <code>-></code> ".</p> +Defaults to " <code>-</code>> ".</p> </li> <li> <p><em>tag=<value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".</p> @@ -2113,7 +2113,7 @@ </div> <div class="paragraph"> <p>+ -<code>%(decorate:prefix=,suffix=,tag=,separator= )</code></p> +%(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p> </div> <div class="dlist"> <dl> @@ -2137,11 +2137,11 @@ </li> <li> <p><em>match=<pattern></em>: Only consider tags matching the given -<code>glob(7)</code> pattern, excluding the "refs/tags/" prefix.</p> +<code>glob</code>(<code>7</code>) pattern, excluding the "refs/tags/" prefix.</p> </li> <li> <p><em>exclude=<pattern></em>: Do not consider tags matching the given -<code>glob(7)</code> pattern, excluding the "refs/tags/" prefix.</p> +<code>glob</code>(<code>7</code>) pattern, excluding the "refs/tags/" prefix.</p> </li> </ul> </div> @@ -2149,7 +2149,7 @@ <dt class="hdlist1"><em>%S</em></dt> <dd> <p>ref name given on the command line by which the commit was reached -(like <code>git log --source</code>), only works with <code>git log</code></p> +(like <code>git</code> <code>log</code> <code>--source</code>), only works with <code>git</code> <code>log</code></p> </dd> <dt class="hdlist1"><em>%e</em></dt> <dd> @@ -2213,15 +2213,15 @@ </dd> <dt class="hdlist1"><em>%gD</em></dt> <dd> -<p>reflog selector, e.g., <code>refs/stash@{1}</code> or <code>refs/stash@{2 -minutes ago}</code>; the format follows the rules described for the +<p>reflog selector, e.g., <code>refs/stash@</code>{1} or <code>refs/stash@</code>{2 +<code>minutes</code> <code>ago</code>}; the format follows the rules described for the <code>-g</code> option. The portion before the <code>@</code> is the refname as -given on the command line (so <code>git log -g refs/heads/master</code> -would yield <code>refs/heads/master@{0}</code>).</p> +given on the command line (so <code>git</code> <code>log</code> <code>-g</code> <code>refs/heads/master</code> +would yield <code>refs/heads/master@</code>{0}).</p> </dd> <dt class="hdlist1"><em>%gd</em></dt> <dd> -<p>shortened reflog selector; same as <code>%gD</code>, but the refname +<p>shortened reflog selector; same as %gD, but the refname portion is shortened for human readability (so <code>refs/heads/master</code> becomes just <code>master</code>).</p> </dd> @@ -2262,7 +2262,7 @@ shown. This option automatically enables the <code>only</code> option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with <code>only=false</code>. E.g., -<code>%(trailers:key=Reviewed-by)</code> shows trailer lines with key +%(<code>trailers:key=Reviewed-by</code>) shows trailer lines with key <code>Reviewed-by</code>.</p> </li> <li> @@ -2273,15 +2273,15 @@ <p><em>separator=<sep></em>: specify the separator inserted between trailer lines. Defaults to a line feed character. The string <sep> may contain the literal formatting codes described above. To use comma as -separator one must use <code>%x2C</code> as it would otherwise be parsed as -next option. E.g., <code>%(trailers:key=Ticket,separator=%x2C )</code> +separator one must use %x2C as it would otherwise be parsed as +next option. E.g., %(<code>trailers:key=Ticket,separator=</code>%x2C ) shows all trailer lines whose key is "Ticket" separated by a comma and a space.</p> </li> <li> <p><em>unfold[=<bool>]</em>: make it behave as if interpret-trailer’s <code>--unfold</code> option was given. E.g., -<code>%(trailers:only,unfold=true)</code> unfolds and shows all trailer lines.</p> +%(<code>trailers:only,unfold=true</code>) unfolds and shows all trailer lines.</p> </li> <li> <p><em>keyonly[=<bool>]</em>: only show the key part of the trailer.</p> @@ -2310,9 +2310,9 @@ </td> <td class="content"> Some placeholders may depend on other options given to the -revision traversal engine. For example, the <code>%g*</code> reflog options will +revision traversal engine. For example, the %g* reflog options will insert an empty string unless we are traversing reflog entries (e.g., by -<code>git log -g</code>). The <code>%d</code> and <code>%D</code> placeholders will use the "short" +<code>git</code> <code>log</code> <code>-g</code>). The %d and %D placeholders will use the "short" decoration format if <code>--decorate</code> was not already provided on the command line. </td> @@ -2320,7 +2320,7 @@ </table> </div> <div class="paragraph"> -<p>The boolean options accept an optional value <code>[=<bool-value>]</code>. The values +<p>The boolean options accept an optional value [<code>=</code><em><bool-value></em>]. The values <code>true</code>, <code>false</code>, <code>on</code>, <code>off</code> etc. are all accepted. See the "boolean" sub-section in "EXAMPLES" in <a href="git-config.html">git-config(1)</a>. If a boolean option is given with no value, it’s enabled.</p> @@ -2367,7 +2367,7 @@ </div> </div> <div class="paragraph"> -<p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted +<p>In addition, any unrecognized string that has a % in it is interpreted as if it has <code>tformat:</code> in front of it. For example, these two are equivalent:</p> </div> @@ -2786,7 +2786,7 @@ </div> </div> <div class="paragraph"> -<p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of +<p>The <code>mode</code> <em><mode></em><code>,</code><em><mode></em><code>..</code><em><mode></em> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two @@ -2827,7 +2827,7 @@ </li> <li> <p>Chunk header format is modified to prevent people from -accidentally feeding it to <code>patch -p1</code>. Combined diff format +accidentally feeding it to <code>patch</code> <code>-p1</code>. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended <em>index</em> header:</p> @@ -2846,7 +2846,7 @@ <div class="paragraph"> <p>Unlike the traditional <em>unified</em> diff format, which shows two files A and B with a single column that has <code>-</code> (minus — appears in A but removed in B), <code>+</code> (plus — missing in A but -added to B), or <code>" "</code> (space — unchanged) prefix, this format +added to B), or " " (space — unchanged) prefix, this format compares two or more files file1, file2,…​ with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X’s line is @@ -2867,9 +2867,9 @@ from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p> </div> <div class="paragraph"> -<p>When shown by <code>git diff-tree -c</code>, it compares the parents of a +<p>When shown by <code>git</code> <code>diff-tree</code> <code>-c</code>, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the -parents). When shown by <code>git diff-files -c</code>, it compares the +parents). When shown by <code>git</code> <code>diff-files</code> <code>-c</code>, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version").</p> 